From 4d57bc4dd879d7fab86246bc48586c463467434e Mon Sep 17 00:00:00 2001 From: robertlipe Date: Mon, 22 Dec 2014 19:32:31 +0000 Subject: [PATCH] Don't let Google format reader crash on malformed route input. --- gpsbabel/google.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gpsbabel/google.cc b/gpsbabel/google.cc index 01786de99..86bdfc44c 100644 --- a/gpsbabel/google.cc +++ b/gpsbabel/google.cc @@ -103,10 +103,12 @@ void goog_segment(xg_string args, const QXmlStreamAttributes*) { Waypoint* wpt_tmp; - wpt_tmp = route_find_waypt_by_name(routehead[goog_segroute], goog_segname); - if (wpt_tmp) { - wpt_tmp->shortname = mkshort(desc_handle, args); - wpt_tmp->description = args; + if (routehead[goog_segroute]) { + wpt_tmp = route_find_waypt_by_name(routehead[goog_segroute], goog_segname); + if (wpt_tmp) { + wpt_tmp->shortname = mkshort(desc_handle, args); + wpt_tmp->description = args; + } } } @@ -285,6 +287,7 @@ google_read(void) routehead = (route_head**)xmalloc(sizeof(route_head*)); routecount = (int*)xmalloc(sizeof(int)); goog_segroute = 0; + routehead[goog_segroute] = NULL; goog_read_file(); -- 2.30.2